Checkpoint

UX changes(incomplete)