fixed some arrangements