Make x and y axes more flexible