[minor] Moved all modes together.
[minor] If the data, is not a function, but defined -- feed it in to the renderer