added order to choice model and better admins