Added scrollpanes to server and client options

* Added scrollpanes to Server options and client Options - also moved
the Save Settings button