[BUGFIX beta] Refactor render to be a bit less crazy