more UI cleanup and swap data