eliminated most margins and added padding