Refactor more rendering