Merging in pull
Managing panel controls on load and on tab switch