More consistent names for strings, layouts, activities and menus.
more renaming
adding mail to the DB
correcting some visual bugs