Cleaned up and added some better grids and animation