More changes to remove 'show' page for Server