Working on navigation and detail view