Server: layout improvements