Update navbar css to be more dynamic and use Unicon styling
Merge remote-tracking branch 'scott/master'