Moved Settings into Tabs and added E-mail settings