Extract widgets to application instance to save #467