Landscape & portrait bug fixed