Simplified grid system
Updated grid margins