Reorganised subview structure