Add better switch rendering