added more links
implemented table loading