Add "Change password" button; delete extra block