Code review & cleanup, step 1: some renaming & reordering
v0.2.4: UI review & improvements
Merge tag 'v0.2.4' into staging

* tag 'v0.2.4':
  v0.2.4: UI review & improvements
  Code review & cleanup, step 1: some renaming & reordering