Please see my updated models

I tested the models and looks OK to me.

Please change the settings in settings.py accordingly.