Revert "aa"

This reverts commit d40c604a7933eb35b980ffc5030d3f25732ac7b3.
improved the UI of the drawing component
Merge branch 'pao'