Rearrange options for registering