#22 added modularity for control panel