Add progress circle and a lot of improvements.