Restructure outer layout
Login form layout changes