Put rendering into seperate class
fixed a few null pointer exceptions