Added support for viewing gallery