Put space between next / skip, don't show skip for flight mode channel as
we must have one
Tidy up some of the commited cloud configs