Fix edit forms, ride structure