UI improvements, threading bugfixes