layout adjustments. duplicated views in data fix.