added changes to gallery page
resolving merge conflict