styling to nav bar
fixed something in app.js but not a big deal
fixed a few things with the modals
Merge branch 'mergetest' into kyle