Changes to general layout to be consistent across all areas