- fix private/public key wording
- various UI fixes and improvements
