Update navigation / fix server problem