Fixed some bugs in device layer navigation.