Add checkpoints and layout improvements