Added checkpoint
UI fix