Added template class and remove styles