More layout fixes (need to test on every screen size that ever existed)