tiny fix to prevent scrolling
remove unused menu entries
Merge remote-tracking branch 'origin/master' into minecraft_integration