Some more minor adjustments to work with different screens