2nd pass on den ui