Shuffles stuff around into a hopefully more sensable layout