CMS Addons Functionalities
Minor fixes and checking, because some of the function are already working.