Lots of improvements to menu UI, other bug fixes