Bug fix
More UI updates