Modifications on the modules and AppPanel