Polishing dsl library, merge predefined widgets library wth controls widgets library