PanoramaWidget and refactoring/bugfixing