Re-arrange Setup page