Finished transfering to new layout