template and css fix
Merge pull request #320 from sumobi/1.2

template and css fix