view changes to fix SWC-1514, SWC-1517, and SWC-1519