@GoalSmashers: I hope you like this change; now the switches respect the spaces and it looks much better IMO.