Navigationfixes, changing comp to work on