Merge "Add Structure pages to management screens" into rvc-dev