Moved some stuff around, hopefully fixed flickering issue.