Change up names for generic block classes, remove unessesary gui class and merge them, also reordered the data manager gui calls a little to remove rendering colour errors