DDB-NEXT_CSS_refactoring bug fixed and general refactoring done