Rearranged structure, gui render update