refactored search, photo gallery and other modules