Add icons;
Review UI