Number of CSS HTML tweaks for redesign
Merge branches 'master' and 'redesign'