improved and better organized drawing tools

Improved and Better Organized Drawing Tools