added systemUsers & modified navigation