Added some options to disable the borders
Added some options to disable the borders