Fixes #12. Re-arrange inputs & labels on register step 1.