template and css optimizations

template and css optimizations