Bugfix and refactoring
Added ClusterHandler to GUI