Clean-up and registration page fix.