A few small demo UI clean ups