move padlock to end of button
remove mailtrap for staging
Merge pull request #1 from neiled/staging

Staging