Some layout cleaning