added template
fixed height
fixed conflicts