Cleaned up Css and Merged Similar Classes

Closes#15