mad margin tweaks to fix later