Static Elements + Content Elements Correction + New features