Improved grid layout