Old OC redraw/lil bit of redesign