Refactoring of extension and ui logic
Tutorial flow, work in progress