Added more template helper methods fixed table