Improved styles some more