Tom's updated UI