Make sure the code reflects the actual selection in the json file.
removed redundant modules, consolidated logic into content-panel module