Finished new View system & updated generator