Added activity functionality. Patched up some of the menus.