Updated UIs slightly