UI cleanup and more info