-improvements in menu system (now works like it should, little adjustment needed)