Added margin and spacing