more UI fixes, including the circle expansion one