Updated renderer to contain layers