Finished UI for #39