Improving finalize page