Removing duplicate CSS, re-naming classes/ID system to allow for more concise CSS