Fixed nav bar issues on small screens and added more content to grids

Some of the forms might need tweeking for higher resolutions.

Settings templates still to do