LPS-34428 reorganizing the way we handle comments and ratings for layouts