updates to nav panel and code refactor