added session and layout