Fixed everything but gallery