Some refactoring; gems in menu items; menu gem now shows overall status