Improvements in server's layout.