Code review & cleanup, step 1: some renaming & reordering
UI review & improvements
v0.2.2