Update UI to use circles instead of a list view. Refactor here and there.