book page design
Fixed merge issues