Added full users view, need to format