major cleanup of views, add user view