More redesign work for v1.7