Rearragements in animations, problems with option bar