Fixed several bugs with the redesigned blueprint tool