More config setup and UI changes