bring dark back, add anchors, layout cleanup