Removing UUID, restructure of lists, added form