2nd pass at moving saves views around