Better submission/nav bar handling