Working on New Session Layout