Cleaned up HTML and CSS a bit