Put delay back in for next button

… and improve label layout