More work on check-out view