Functional and visual issues in register widget

This fixes #3408. I've implemented the layout changes suggested by Sam.