WIP - UI stage 3, save and delete components