Adding a formrow for the layout and using it with the login
Fixing failing test because of the new layout