Grid system instead of Custom class

Sorry for the mess.