further design consistency work