UI changes/fix/integration