bug fixes admin and gallery impl