commit before implementing grid layout