Updated FUNCTIONAL UI