Current User View fixes