Improved styling and minor fixes