UI Tweaks for new control

UI Tweaks for new controls