Improved some styling stuff