Using a dedicated section for each panel
Code cleanup