css hack still terrible, but at least it looks better than before
Merge branch 'fixes'