Remove blogroll partial (assume /links points to same content)
Move all site navigation into partial

Also stop nesting links inside <menu>