updated layout and first page