Frits, it might be better if you provide a screenshot to avoid potentially re doing all your work after 1.95 is released.
Better to revise while you are working on it as we all seem to have different views on it.
It would also let me possibly see if there is any progress on the Device set up idea I suggested as a solution to a rather large problem that is of course now very well documented