Remove the UI aspect and move it to a new component