cleaned up grid layout