Moving to activities WIP
Moved navigation to activity based navigation