UI improvement, tweaks, bugfixes