Merge branch 'master' into beta
Tweaked css
Merge branch 'beta'