Add icon and improve user interface