Added ability to change default margins and other touch ups