Updated models and modified admin view.