Grid system fix

Using the grid system instead of custom class