Fix #1407 and start implementing a solution for #1172, current menu items don't do anything at the moment