Changes to layout of Server tab as discussed in PR 712