fixed the margins and a few other things