ETA on air calculation works nicely now, and some layout fixes