Remove "Session". Change order of contents.