Updated views to support admin user