Improved styling again