edited some padding and spacing issues