Gallery with comments and modified callbacks

Change-Id: I90b82177bedd4057fc57a7589ac3a8b7a176ddaa