fixed margin and padding issues