Do some consistency-changes in layout