Added responsive email form + some cleanup