small changes with header bar highlighting
Made selected navbar item easier
Fixing conflict
Removing extra files, reorganizing test suite