Refatctoring subview management