fixing formatting and email input field