Refactored grid and added SASS variables