Some layout cleanup