Clean-Up

Renaming elements, removing unnecessary CSS