Fixed add tool functionality and made UI enhancements