margin and spacing fixes