Final UI cleanup