box-sizing and some template less changes