Add better rendering