Cleaned up grid functions and mixins
Refactored how modifiers work
Updated for usage changes