Use real buttons again