fixed some more margin stuff
fixed merge conflicts