App works in portrait and landscape orientations, more robustly.