fixed bug with removing controls by saving