Hook up more of UI to new data