Further work to modal registration window.