Feature/book sections improvements