[ISSUE-12]: Orientation change