Improve some ui features