Handled graphics layers better