UI change and added email dev button
Minor bugs and code cleanup