Changed navigation UX, updated routing