Refactored and cleaned up HTML