Started to implement the new switches in data and normalization tabs.