Changed hierarchy of activities to fix navigation