Clean up a lot, fit label margins to label size, allow user editable margins