Speed improvements. Also fixing flashing flyout