More UI updates and bug squashing. Some code cleanup