Few improvements on UI