Fix layouts to prevent squished buttons and boxes