fixed broken classes + removed email form