More fixes for ManageStates.js - also, add it to context menu