finished with make scenario, minor UI updates