Restyle and render performance improvements.
Completed the refactor.
Merge pull request #2 from roelvanhintum/develop

Merge Develop