remove xtemlate and fix css