Refactored the nav template a bit. I like the pills look better.