UI and sample data changes as well as the ending page