redesigned UI, added views for admin
pull from sherlyn sept13-2013