Updated Defaul layout and first page