-Save prefix and title
-Fix padding around account name
-Add back additional tracking