intermediate refactorings to the async handlers in the software plan ui

Also fixes 500 import error