design changes and routing improvements on session state change