Layout reorganized.