Fix navigation "active" link to be loaded page
Fix navbar 'flicker' due to re-size on brand image

 - I cheated and put a style into markup.  This is because I don't see
   this solution lasting long anyway.