Fixes for wider viewports