Fixed overlap

All the overlap and sizeing fixed on all the templates.