bugs fixed. UI updated