Merge "Add `margin-bottom` for editButtons (EditPage)"