Added more structs to make final gui struct more concise