Major CSS fix
Merge branch 'jacky'