bugfix and minor ui tweaks