Bunch of tweaks and session list logic