more updates

a lot of spacing and margin fixes