#69 and #34 - [Gallery] Let layout follow spec and Landscape layout ...

fixed #69 and #34