Cleaned up CSS and markup