Fix memory leak
Adjust UI