Add Druid GUI & Cleanup