Add icon and small ui changes