Separated configs and fix UI bug