Added some more styling hacks