small changes to Setup screen layout

Organize servos together