Admin views and cleaned up