adjust margin and remove height setter