Organization, modified some gui stuff