consolidate admin functions; add some views