add layout page
fix merge issues