latest working build - 24th march - ui and bug fixed