Some more changes (admin app)