Navigation and binding improvements