fix edit placement and edit margins