Fixed overlap

All the overlap and sizeing fixed on all the templates.
Fixed overlap 2.0

This files did not get synked last commit
Sizing boxes

Made the different boxes more usable
Merge pull request #306 from HGustavs/codeviewer-buggfix-boxoverlap-#256

Codeviewer buggfix boxoverlap #256