Fixed navigation; completed data binding