Updated Namespace, started on OptionsPage, added MainMenu