Fixing TC on TL for touch devices
Circle building UI update
Lots of UI cleanup