Added preferences to maintain consistency during orientation-change.