Several changes, mostly navigation connectd with rest