UI changes by Anna
Updates