Added tools + drawing loop