Improved CSS and simplified markup