Fix some sizing issues by making margins relative and use css boz-sizing...

...: border-box