Several changes to gallery