Issue #11: Refactored Grid/List code so last selection persists between visting other pages.