Tons of menu improvements and optimizations, also small fixes and tweaks here and there