UI And functionality updates