some changes in admin, models and views