Fix/renders refactor