GUI/Structure: Edit - Some Changes