Moved code a bit,

squashed the selectively render GUI bug