fixed topology layout bugs