added pwdRecovery/mailservice, fixed button layout