Add airline plugin + fixes