Fixed layer moving and removing bugs