fixed some margin problems