enhancement in form and fix navigation system