fixed login, merge of adminmenu.jsp and layout.jsp