rearanged layout