css & template improvement
css & template improvement