Fine-tune widgets, counselor, rectangles

Counselor still needs a little more work on positioning.