Improved some more styling