Some refactoring, adding gallery detail still WIP