Refactored cleanname, improved display of gallery