Made improvements to element classes for easier CSS styling