Remove gallery + various bugfixes