Improve Model rendering