added some margin tweaks