Edit and improve UX

change some UI setting