Updated layout and login