Redesign Session window ref #43