Added Settings, and renewed email functionality