Grid layout fixes