LPS-37937 Make add page UI from the Control Panel consistent