Design and Registration fix