implemented new layout for server-view