Fix tools render + add new render