finish ui fix, we can close issue #40