change display to circle, fix bugs