Updated CSS to deal with 3 deep nested lists in the navbar
Lots of field name changes from our meeting with Missy.
More model tweaks based on our meeting.
Merge remote-tracking branch 'origin/master'