few more small changes to borders and spacing