Important code changes

New layout + code to save email in database