fix template naming issue
improve css