Rewrote rendering of content and (hopefully) fixed build