Modify grid styles
Refactor grid system