Fixing stuff that broke due to styling changes

Fixes #410 #411