ZUI

ZUI bug-fixes and easier to read