Commit to get Scott's code
add nav class
update to add debug textboxes
Merge branch 'master' into Scott
merge