Some clean up, more UI work