UI bugfixes + revised prefs