Fixed bug with navigation load order