Started CSS outline
Merge branch 'dev-john' into dev