layout: some fix