Rename and some margin fixes.