Tidy up and convert to simple command line app, since I no longer need
the Widget to check the layout.