Respond to media queries
Extracted general layout metrics into separate file
Removed min columns limit
Fixed merge conflict