IS: misc fixes
IS: bleh
IS: menu refactor