Refactor control CSS
Merge branch 'griddle-redux' of github.com:guardian/frontend into griddle-redux