Add view and controller for choosing order; minor tweaks