App no longer crashes on rotation