First CSS Changes
Merge branch 'master' into feature/redesign