Quick fix to grid layout