clean up models and added fields to make the view reverser work