Layout reorganized