Rewritten Rendering Functions

Enhanced modularizing