RPV-107 - Moved units into the session so it will display on each page