More changes to multinavigator. Tested stuff