Fixes plus session control

Added session control for temporary switching and testing purposes. Also
made a few changes to collection listing page.