Finalizing Design.xsp