Margins

Fixes to margins but borders are not drawn to the full width yet.