Menus and sub-menus (display) restructured and reorganized re-organization of folders still to be done)