Added updated layout