Hotfixes to styling