Additional UI cleanup