Improvements to logic, panels get skipped now if no site is selected.
Merged