advance setting change, margin fix