Added an option to show borders