Fix the settings layout for small screens

The settings layout was broken on small devices.
This is ground work for adding the change password inputs to the settings page.