layout and sort changes