Fix for Grid layout