Some cleaning in the UI