Various rework of UI, changes of paths, prior to launch.