some margins and fixes