added session controller and various display tweaks