New gallery and bug fixes