Refactored catalog code to use only one JSP