Fixed some positioning and changed to proper new uuid