94e1b9e05b
- ensure normal and watch-only stuff looks consistent - simplify UI by removing unneeded UI layout elements - change some comments to watch-only from watchonly