Large UI work, modified workflow