Apply mikachu's patch to fix location of root menu
Fix sloppiness in fixed root menu implementation