added torus
fixed ui bugs