improve ui , #1