refractoring and basic data import layout