Restructure rendering: it is now GUI oriented
Move lines around, no functional changes