Cleaned up CSS after merge.
deleted extra unused code that added warning if the code wasn't working.
Cleaned up HTML after merge.