Improve "return to" option

Only put the label element around the checkbox and the label, this means you
can click in the inputs without toggling the checkbox. Also shorten the inputs
such that they do not wrap.