some margin and padding fixes