Cleaned up CSS and HTML