Redesigned UI and Data configuration