Working changes to register & dashboard