Fix for drawing single data point
Add padding on each end of x-axis
Only set margins in one place