Fixes flicker/animation due to new option views begin added in default state and then changed back to the state of the existing view. Fixes #403