Fix a few ui issues