Fixed navigator and changed Main class