Refactored config UI