Moved navigation into partial