UI improvements, bugfixes, plain flags (only one)