more config and UI fixes