Switch from content-box to border-box for layout
Layout cleanup