some margin issues fixed