Re-structuring customizer controls etc.