Fix Layer showing/hiding