Template fixes for client module lists #21