edited menus, refactored RH-template