Merge required borders and remove unnecessary ones. Related to #35 ,
#33 , #32 , #31, #30 , #29 , #28