menu system + bugfixes