Address lots of code review feedback and implement the check mark for selected item.