UIHandler added, and some bugfix