* Added catering for main Margin\r\n* Added catering for sidebar border styling