fix several ui issues