Fixed up order associations/controller