Improvements on UI