Tidy up

Deleted settings.scss, moved all css out of screen.scss so it is just imports, tidied up block-grid