bugs fixed in ui