CSS and code improvements