Making sure the correct CSS is used

Lost some pieces in the merge apparently, this should fix that.
Merge branch 'master' into stable