Refactored navigation and filled 'concierto'