fixed UI bugs andadded an icon