Cleaning up the catalog and item detail functionality and display