Added borders and spacing for elements