adding content on server tables

Added content on server tables and cleaned up remaining content