Minor layout changes to increase compatibility with different
Resolutions