Updated session and wall templates