Revert "Started work on a flexible menu"

This reverts commit 54bb90f804689116e1c64980837982a82f92a4c4.
Fixed some minor issues after a WAMP-update