Finish Catalog-Disply
Finished
Merge branch 'Catalog-Display'