Improve design and add email form