Fix all layout problems