Merge branch 'devel'
CSS changes to make it look more pretty.