Clean up and added basic grid system.