Changes to framework & adminmenu