[BUGFIX 21] Fix orientation changing issue on large screen by getting rid of nested fragment