updated layout and structure