re-worked user/session views