committing the changes for UI cleanup