Adding title bar update and session fix