Gallery updated

Also removed old framework