Re-arrange settings