More changes for #2, changes to UI