Added admin views and shallow logic