Clean up navigation
Change type to utype