Work on control resize and changes for deployment