remove old, unused template parts
adjust spacing