moved session list state and some cleanups