added ContainerNavigator.java, not sure if it works as expected though....