more changes and registration module markup