Fixed layout bug - layout state not preserved as different topics are selected