Issue#230 login layout

Login and setup page changes to work with the new layout