Refactor/formsmanager