fixing and optimising some classes.
coding Grouping Context element classes.