Slightly better button logic