Fix x-axis issues and expand range