Refactoring the panels.
Switched to direct panel template.