Better settings update and server reload
Factored layout