Specificity

Refactored code and added better class names to increase clarity.
Merge branch 'master' into gh-pages