UPDATED fixed a small issue of display when navigating away and back.
UPDATED improved on the bug fix.