Final tweaks

The nav link highlights weren't working for me -- this fixes that, makes it less brittle, and makes the active page / hover states move distinct.

@seanmonstar please review. If you're r+, then let's deploy it. :)