Moved padding to grid properties and added shuffle back in