Some changes to models and views in admin panel