Cleanup, WIP on binding title through modal.