Some more refactoring for tunnel (made tunnelview an anonymous class,
instead of inner class)