Book form bug fixing