Update for orientation changes. Improve performance.