Dock to right

see commit comments