styling to nav bar
fixed a few things with the modals
Merge branch 'mergetest' into kyle