Reverted gallery to Vadim's commit