cleaned up and removed grid layout