Use component/classes instead of custom class manipulation functions
Move email form input handling into a component