Various tweaks

Change-Id: I14847e33f98663b317a33329eece0e39753b9fae
Increase UI responsiveness

Change-Id: Ia76adf8097be49bf7ca46efe5161876bc1f69adf