Add back submenu arrows, misc fixes