UI enhancement and bug squashing