CHANGED: Update admin views for better layout