Introduced UI module
Updates and fixes