cleanup, switch to margins instead of padding