More styling bugfixes