Move options into correct order