Code clean-up. Refactor
Code clean-up. Refactor
Fix some html
Add sort and display properties for cataloges