Index: branches/RC/core/admin_templates/popups/column_picker.tpl
===================================================================
diff -u -r11482 -r11538
--- branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11538)
@@ -1,5 +1,5 @@
 <inp2:adm_SetPopupSize width="600" height="500"/>
-<inp2:m_RequireLogin/>
+<inp2:m_RequireLogin login_template="login"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="column_picker" module="in-portal"/>
 
@@ -20,15 +20,9 @@
 
 					a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 								submit_event('adm','OnClosePopup');
-//								window_close();
 							}
 					 	) );
 
-				/*	a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-							reset_form('adm', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
-						}
-				 	) );*/
-
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 					a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_MoveUp" escape="1"/>', function() {
@@ -48,7 +42,7 @@
 	</tr>
 </tbody>
 </table>
-
+<div id="scroll_container">
 <table width="100%" border="0" cellspacing="0" cellpadding="4" >
 	<tr>
 		<td>
@@ -89,8 +83,8 @@
 		<td>&nbsp;</td>
 	</tr>
 </table>
+</div>
+<input type="hidden" name="main_prefix" value="<inp2:m_get var='main_prefix'/>"/>
 
-<input type="hidden" name="main_prefix" value="<inp2:m_get var="main_prefix"/>"/>
-</form>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file