Catalogue views refactoring. Removing duplicate code.
many bug fixes, catalogue refactoring
Minor fixes and enhancements
Bug fixed
CSS to show some resources with avatars
fix merge
fix merge