added props to all controls and tweaks