moved nav to top, refactored code, other minor improvements
Merge branch 'develop' of https://github.com/mtdbass5/audio-testing into develop