More work on the UI, started connecting things together