Remove email form
More design fixes