navigation fixed
merged