Repair wonky CSS issues
Merge branch 'alex'