A ton of changes to display and user flow