Revise work division and re-enable pretty preview