Bugfix, refactoring and added button to show more neighbors