BUG: Better xaxis handling for partial layout