Merge "Refactor UI catalog page, Fix pagination"