updates to nav panel and code refactor
Merge pull request #14 from c2y3dc/master

updates to nav panel and code refactor