some UI bugs fixed