Added and fixed proper rendering functions