Topic/layers drawer fix