fix navigation and add comment to activity