WIP cleaning Edit sub component views