further layout cleanup